From f16746dab1822abaef7aa70718b006a56655f454 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 29 Jun 2004 15:59:35 +0000 Subject: [PATCH] use waypt_new instead of explict xcalloc - see message to -code about this. Add explict casts on allocators. gpsutil: add test for unknown alt on output. jeeps: don't use 'true' in unused (sigh) code. i65.anr.gpx, reference/netstumbler.mps: regenerate for alt change. --- gpsbabel/delgpl.c | 2 +- gpsbabel/easygps.c | 14 +- gpsbabel/garmin.c | 2 +- gpsbabel/gcdb.c | 2 +- gpsbabel/gpilots.c | 4 +- gpsbabel/gpsutil.c | 2 +- gpsbabel/jeeps/gpsmem.c | 14 +- gpsbabel/jeeps/gpsnmea.h | 14 +- gpsbabel/navicache.c | 2 +- gpsbabel/netstumbler.c | 2 +- gpsbabel/ozi.c | 4 +- gpsbabel/palmdoc.c | 4 +- gpsbabel/psitrex.c | 6 +- gpsbabel/quovadis.c | 12 +- gpsbabel/reference/netstumbler.mps | Bin 4838 -> 4838 bytes gpsbabel/reference/track/i65.anr.gpx | 1653 -------------------------- gpsbabel/saroute.c | 10 +- gpsbabel/tiger.c | 2 +- gpsbabel/util.c | 16 +- gpsbabel/waypt.c | 4 +- 20 files changed, 58 insertions(+), 1711 deletions(-) diff --git a/gpsbabel/delgpl.c b/gpsbabel/delgpl.c index 5619f533d..03c2932bb 100644 --- a/gpsbabel/delgpl.c +++ b/gpsbabel/delgpl.c @@ -63,7 +63,7 @@ gpl_read(void) track_add_head(track_head); while (fread(&gp, sizeof(gp), 1, gplfile_in) > 0) { - wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); + wpt_tmp = waypt_new(); le_read64(&wpt_tmp->latitude, &gp.lat); le_read64(&wpt_tmp->longitude, &gp.lon); le_read64(&wpt_tmp->altitude, &gp.alt); diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c index d568b2610..45e740017 100644 --- a/gpsbabel/easygps.c +++ b/gpsbabel/easygps.c @@ -82,7 +82,7 @@ pread(void) int ilen; ilen = fgetc(file_in); - d = xmalloc(ilen + 1); + d = (char *) xmalloc(ilen + 1); fread(d, ilen, 1, file_in); d[ilen] = 0; return d; @@ -100,25 +100,25 @@ data_read(void) unsigned char tag; waypoint *wpt_tmp; - wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1); + wpt_tmp = waypt_new(); for (tag = fgetc(file_in); tag != 0xff; tag = fgetc(file_in)) { switch (tag) { case 1: - wpt_tmp->shortname = pread(); + wpt_tmp->shortname = (char *) pread(); break; case 2: case 3: - wpt_tmp->description = pread(); + wpt_tmp->description = (char *) pread(); break; case 5: - wpt_tmp->notes = pread(); + wpt_tmp->notes = (char *) pread(); break; case 6: - wpt_tmp->url_link_text = pread(); + wpt_tmp->url_link_text = (char *) pread(); break; case 7: - wpt_tmp->icon_descr = pread(); + wpt_tmp->icon_descr = (char *) pread(); break; case 8: /* NULL Terminated (vs. pascal) descr */ bbufp = bbuf; diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index 7e6882f28..075c8e9a2 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -168,7 +168,7 @@ waypt_read(void) } for (i = 0; i < n; i++) { - waypoint *wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); + waypoint *wpt_tmp = waypt_new(); wpt_tmp->shortname = xstrdup(way[i]->ident); wpt_tmp->description = xstrdup(way[i]->cmnt); diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c index 84e5725ce..bde86f8ef 100644 --- a/gpsbabel/gcdb.c +++ b/gpsbabel/gcdb.c @@ -98,7 +98,7 @@ data_read(void) } for(pdb_rec = pdb->rec_index.rec; pdb_rec; pdb_rec=pdb_rec->next) { - waypoint *wpt = xcalloc(sizeof(*wpt),1); + waypoint *wpt = waypt_new(); struct dbrec *rec = (struct dbrec *) pdb_rec->data; int nflds; int length; diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c index fb8f6f1a7..5cb352bc6 100644 --- a/gpsbabel/gpilots.c +++ b/gpsbabel/gpilots.c @@ -188,7 +188,7 @@ data_read(void) int lon; int sz; - wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); + wpt_tmp = waypt_new(); rec = (struct record *) pdb_rec->data; switch(rec->header.type) { @@ -219,7 +219,7 @@ data_read(void) tp = (Custom_Trk_Point_Type *) ((char *) pdb_rec->data + sizeof(rec->wpt.CustTrkHdr)); /* FIXME: This is incomplete and probably wrong */ while (sz--) { - wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); + wpt_tmp = waypt_new(); lon = le_read32(&tp->lon); lat = le_read32(&tp->lat); wpt_tmp->longitude = lon / 2147483648.0 * 180.0; diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.c index 21ffe1ba6..eeec5659f 100644 --- a/gpsbabel/gpsutil.c +++ b/gpsbabel/gpsutil.c @@ -124,7 +124,7 @@ gpsutil_disp(const waypoint *wpt) lat < 0.0 ? 'S' : 'N', fabs(lon), lon < 0.0 ? 'W' : 'E', - wpt->altitude, + wpt->altitude == unknown_alt ? 0 : wpt->altitude, 'm', wpt->description ? tdesc : "", icon_token); diff --git a/gpsbabel/jeeps/gpsmem.c b/gpsbabel/jeeps/gpsmem.c index 0ba1ec59c..5635adbc0 100644 --- a/gpsbabel/jeeps/gpsmem.c +++ b/gpsbabel/jeeps/gpsmem.c @@ -568,7 +568,7 @@ GPS_PBod GPS_Bod_New(void) ret->valid = 0; *ret->dest = *ret->start = '\0'; - ret->true = ret->mag = (double)0.; + ret->True = ret->mag = (double)0.; return ret; } @@ -698,7 +698,7 @@ GPS_PRmb GPS_Rmb_New(void) ret->valid = 0; *ret->owpt = *ret->dwpt = ret->warn = ret->correct = ret->alarm = '\0'; - ret->cross = ret->lat = ret->lon = ret->range = ret->true = ret->velocity = + ret->cross = ret->lat = ret->lon = ret->range = ret->True = ret->velocity = (double)0.; return ret; @@ -869,7 +869,7 @@ GPS_PBwc GPS_Bwc_New(void) *ret->wpt = '\0'; ret->time = (time_t)0; ret->valid = 0; - ret->lat = ret->lon = ret->true = ret->mag = ret->dist = (double)0.; + ret->lat = ret->lon = ret->True = ret->mag = ret->dist = (double)0.; return ret; } @@ -912,7 +912,7 @@ GPS_PBwr GPS_Bwr_New(void) *ret->wpt = '\0'; ret->time = (time_t)0; ret->valid = 0; - ret->lat = ret->lon = ret->true = ret->mag = ret->dist = (double)0.; + ret->lat = ret->lon = ret->True = ret->mag = ret->dist = (double)0.; return ret; } @@ -1035,7 +1035,7 @@ GPS_PHsc GPS_Hsc_New(void) return NULL; ret->valid = 0; - ret->true = ret->mag = (double)0.; + ret->True = ret->mag = (double)0.; return ret; } @@ -1158,7 +1158,7 @@ GPS_PVhw GPS_Vhw_New(void) return NULL; ret->valid = 0; - ret->true = ret->mag = ret->wspeed = ret->speed = (double)0.; + ret->True = ret->mag = ret->wspeed = ret->speed = (double)0.; return ret; } @@ -1241,7 +1241,7 @@ GPS_PVtg GPS_Vtg_New(void) return NULL; ret->valid = 0; - ret->true = ret->mag = ret->knots = ret->khr = (double)0.; + ret->True = ret->mag = ret->knots = ret->khr = (double)0.; return ret; } diff --git a/gpsbabel/jeeps/gpsnmea.h b/gpsbabel/jeeps/gpsnmea.h index 163cb0cdb..53255c65a 100644 --- a/gpsbabel/jeeps/gpsnmea.h +++ b/gpsbabel/jeeps/gpsnmea.h @@ -52,7 +52,7 @@ typedef struct GPS_SRmm typedef struct GPS_SBod { - double true; + double True; double mag; char dest[83]; char start[83]; @@ -98,7 +98,7 @@ typedef struct GPS_SRmb double lat; double lon; double range; - double true; + double True; double velocity; char alarm; int32 valid; @@ -152,7 +152,7 @@ typedef struct GPS_SBwc time_t time; double lat; double lon; - double true; + double True; double mag; double dist; char wpt[83]; @@ -164,7 +164,7 @@ typedef struct GPS_SBwr time_t time; double lat; double lon; - double true; + double True; double mag; double dist; char wpt[83]; @@ -186,7 +186,7 @@ typedef struct GPS_SHdm typedef struct GPS_SHsc { - double true; + double True; double mag; int32 valid; } GPS_OHsc,*GPS_PHsc; @@ -205,7 +205,7 @@ typedef struct GPS_SR00 typedef struct GPS_SVhw { - double true; + double True; double mag; double wspeed; double speed; @@ -224,7 +224,7 @@ typedef struct GPS_SVwr typedef struct GPS_SVtg { - double true; + double True; double mag; double knots; double khr; diff --git a/gpsbabel/navicache.c b/gpsbabel/navicache.c index 7cece8654..763cb6d13 100644 --- a/gpsbabel/navicache.c +++ b/gpsbabel/navicache.c @@ -111,7 +111,7 @@ nav_start(void *data, const char *el, const char **attr) { if (0 == strcmp(el, "CacheDetails")) { const char **ap; - wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1); + wpt_tmp = waypt_new(); for (ap = attr; *ap; ap+=2) { if (0 == strcmp(ap[0], "cache_id")) { wpt_tmp->shortname = xstrdup(ap[1]); diff --git a/gpsbabel/netstumbler.c b/gpsbabel/netstumbler.c index 487fc0c48..8faf7d943 100644 --- a/gpsbabel/netstumbler.c +++ b/gpsbabel/netstumbler.c @@ -166,7 +166,7 @@ data_read(void) if (lat == 0 && lon == 0) /* skip records with no GPS data */ continue; - wpt_tmp = (waypoint *) xcalloc(sizeof(*wpt_tmp), 1); + wpt_tmp = waypt_new(); if (stealth) { if (!snmac) diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c index a2d5fbcd7..cf9915c53 100644 --- a/gpsbabel/ozi.c +++ b/gpsbabel/ozi.c @@ -79,7 +79,7 @@ ozi_openfile(char *fname) { } /* allocate more than enough room for new filename */ - tmpname = xcalloc(1, strlen(fname) + + tmpname = (char *) xcalloc(1, strlen(fname) + strlen(buff) + strlen(ozi_extensions[ozi_objective]) + 2); /* . (dot) plus null term */ @@ -550,7 +550,7 @@ data_read(void) } if ((strlen(buff)) && (strstr(buff, ",") != NULL)) { - wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1); + wpt_tmp = waypt_new(); /* data delimited by commas, possibly enclosed in quotes. */ s = buff; diff --git a/gpsbabel/palmdoc.c b/gpsbabel/palmdoc.c index 8994e7169..f456e3489 100644 --- a/gpsbabel/palmdoc.c +++ b/gpsbabel/palmdoc.c @@ -327,7 +327,7 @@ static void commit_buffer( void ) { } static void create_bookmark( char *bmtext ) { - struct bookmark *newmark = xcalloc( 1, sizeof(struct bookmark)); + struct bookmark *newmark = (struct bookmark *) xcalloc( 1, sizeof(struct bookmark)); newmark->next = bookmark_tail; newmark->offset = offset; newmark->text = bmtext; @@ -342,7 +342,7 @@ static void docprintf( int maxlen, char *format, ... ) { int newlen; int partlen; - txt = xmalloc( maxlen ); + txt = (char *) xmalloc( maxlen ); va_start( list, format ); newlen = vsprintf( txt, format, list ); diff --git a/gpsbabel/psitrex.c b/gpsbabel/psitrex.c index f23aea611..00336f1ef 100755 --- a/gpsbabel/psitrex.c +++ b/gpsbabel/psitrex.c @@ -288,7 +288,7 @@ psit_waypoint_r(FILE *psit_file, waypoint **wpt) double psit_depth = unknown_alt; if (strlen(psit_current_token) > 0) { - thisWaypoint = xcalloc(sizeof(*thisWaypoint), 1); + thisWaypoint = waypt_new(); thisWaypoint->latitude = atof(psit_current_token); @@ -414,7 +414,7 @@ psit_route_r(FILE *psit_file, route_head **rte) while (psit_isKnownToken(psit_current_token) != 0) { if (strlen(psit_current_token) > 0) { - thisWaypoint = xcalloc(sizeof(*thisWaypoint), 1); + thisWaypoint = waypt_new(); thisWaypoint->latitude = atof(psit_current_token); @@ -545,7 +545,7 @@ psit_track_r(FILE *psit_file, route_head **trk) while (psit_isKnownToken(psit_current_token) != 0) { if (strlen(psit_current_token) > 0) { - thisWaypoint = xcalloc(sizeof(*thisWaypoint), 1); + thisWaypoint = waypt_new(); thisWaypoint->latitude = atof(psit_current_token); diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c index 7300f5971..9a2546f19 100644 --- a/gpsbabel/quovadis.c +++ b/gpsbabel/quovadis.c @@ -128,7 +128,7 @@ data_read(void) for (i = 0; i < num_recs; i++) { waypoint *wpt_tmp; - wpt_tmp = xcalloc(sizeof(*wpt_tmp),1); + wpt_tmp = waypt_new(); rec = (struct record *) &(pdb_rec->data[i * sizeof(struct record)]); @@ -166,12 +166,12 @@ quovadis_writewpt(waypoint *wpt) fatal(MYNAME ": libpdb couldn't append record\n"); } - current_rec = xcalloc(MAXCHUNKSIZE, 1); + current_rec = (ubyte *) xcalloc(MAXCHUNKSIZE, 1); rec_index = 0; rec_ptr = current_rec; } - rec = xcalloc(sizeof(*rec),1); + rec = (struct record *) xcalloc(sizeof(*rec),1); be_write32(&rec->longitude, (wpt->longitude + 180.0) * 1000000.0); @@ -211,8 +211,8 @@ static int compare(const void *a, const void *b) { - const struct hdr *wa = a; - const struct hdr *wb = b; + const struct hdr *wa = (const struct hdr *) a; + const struct hdr *wb = (const struct hdr *) b; return strcmp(wa->wpt->shortname, wb->wpt->shortname); } @@ -248,7 +248,7 @@ data_write(void) * Turns out plain old strcmp will do the trick... */ - htable = xmalloc(ct * sizeof(*htable)); + htable = (struct hdr *) xmalloc(ct * sizeof(*htable)); bh = htable; QUEUE_FOR_EACH(&waypt_head, elem, tmp) { diff --git a/gpsbabel/reference/netstumbler.mps b/gpsbabel/reference/netstumbler.mps index 522394671a7004556d650b30a81a07fba841e153..13e9dab0601ffa9d556e88e5710dac2d5dd18c97 100644 GIT binary patch delta 401 zcmYjN%W48a5OjRZI=g099Re#7$Yl?LpW$yr&_qKXB6C%7kq~moC0Y;b#--h^&FBz@^Qlo7_b;&z}Jf*E3Ee`!z>+tDsg1&?ySP9NR<*ToQn63 zPfLU}w<(VeB{3^Mxn^cKB_z_ShqPjcB)+2>IJagJOHTSDr}av-@#ftcB$0U&htg{9 z83rDFLA#WA)$f2w`2M3tM}CEkZ)aPGf(O%$L5FMuePMns;#z(d^>(JBl=5P#RfIkb zB5%r?g#Y!wA$ciriR^3pzOXnKNv$}GdS9lZl=5P%RfM(% zkvC;cqyPGSL|#g?a2>xGS5n!e^fgu7*6%gHs?YTsH{P7)yJ6Kf(M_}G_+7K}2Y#Du AR{#J2 diff --git a/gpsbabel/reference/track/i65.anr.gpx b/gpsbabel/reference/track/i65.anr.gpx index adab1d8c5..d0a4f7973 100644 --- a/gpsbabel/reference/track/i65.anr.gpx +++ b/gpsbabel/reference/track/i65.anr.gpx @@ -9,6615 +9,4962 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/ - 0.000000 \00000 - 0.000000 \00001 - 0.000000 \00002 - 0.000000 \00003 - 0.000000 \00004 - 0.000000 \00005 - 0.000000 \00006 - 0.000000 \00007 - 0.000000 \00008 - 0.000000 \00009 - 0.000000 \0000a - 0.000000 \0000b - 0.000000 \0000c - 0.000000 \0000d - 0.000000 \0000e - 0.000000 \0000f - 0.000000 \00010 - 0.000000 \00011 - 0.000000 \00012 - 0.000000 \00013 - 0.000000 \00014 - 0.000000 \00015 - 0.000000 \00016 - 0.000000 \00017 - 0.000000 \00018 - 0.000000 \00019 - 0.000000 \0001a - 0.000000 \0001b - 0.000000 \0001c - 0.000000 \0001d - 0.000000 \0001e - 0.000000 \0001f - 0.000000 \00020 - 0.000000 \00021 - 0.000000 \00022 - 0.000000 \00023 - 0.000000 \00024 - 0.000000 \00025 - 0.000000 \00026 - 0.000000 \00027 - 0.000000 \00028 - 0.000000 \00029 - 0.000000 \0002a - 0.000000 \0002b - 0.000000 \0002c - 0.000000 \0002d - 0.000000 \0002e - 0.000000 \0002f - 0.000000 \00030 - 0.000000 \00031 - 0.000000 \00032 - 0.000000 \00033 - 0.000000 \00034 - 0.000000 \00035 - 0.000000 \00036 - 0.000000 \00037 - 0.000000 \00038 - 0.000000 \00039 - 0.000000 \0003a - 0.000000 \0003b - 0.000000 \0003c - 0.000000 \0003d - 0.000000 \0003e - 0.000000 \0003f - 0.000000 \00040 - 0.000000 \00041 - 0.000000 \00042 - 0.000000 \00043 - 0.000000 \00044 - 0.000000 \00045 - 0.000000 \00046 - 0.000000 \00047 - 0.000000 \00048 - 0.000000 \00049 - 0.000000 \0004a - 0.000000 \0004b - 0.000000 \0004c - 0.000000 \0004d - 0.000000 \0004e - 0.000000 \0004f - 0.000000 \00050 - 0.000000 \00051 - 0.000000 \00052 - 0.000000 \00053 - 0.000000 \00054 - 0.000000 \00055 - 0.000000 \00056 - 0.000000 \00057 - 0.000000 \00058 - 0.000000 \00059 - 0.000000 \0005a - 0.000000 \0005b - 0.000000 \0005c - 0.000000 \0005d - 0.000000 \0005e - 0.000000 \0005f - 0.000000 \00060 - 0.000000 \00061 - 0.000000 \00062 - 0.000000 \00063 - 0.000000 \00064 - 0.000000 \00065 - 0.000000 \00066 - 0.000000 \00067 - 0.000000 \00068 - 0.000000 \00069 - 0.000000 \0006a - 0.000000 \0006b - 0.000000 \0006c - 0.000000 \0006d - 0.000000 \0006e - 0.000000 \0006f - 0.000000 \00070 - 0.000000 \00071 - 0.000000 \00072 - 0.000000 \00073 - 0.000000 \00074 - 0.000000 \00075 - 0.000000 \00076 - 0.000000 \00077 - 0.000000 \00078 - 0.000000 \00079 - 0.000000 \0007a - 0.000000 \0007b - 0.000000 \0007c - 0.000000 \0007d - 0.000000 \0007e - 0.000000 \0007f - 0.000000 \00080 - 0.000000 \00081 - 0.000000 \00082 - 0.000000 \00083 - 0.000000 \00084 - 0.000000 \00085 - 0.000000 \00086 - 0.000000 \00087 - 0.000000 \00088 - 0.000000 \00089 - 0.000000 \0008a - 0.000000 \0008b - 0.000000 \0008c - 0.000000 \0008d - 0.000000 \0008e - 0.000000 \0008f - 0.000000 \00090 - 0.000000 \00091 - 0.000000 \00092 - 0.000000 \00093 - 0.000000 \00094 - 0.000000 \00095 - 0.000000 \00096 - 0.000000 \00097 - 0.000000 \00098 - 0.000000 \00099 - 0.000000 \0009a - 0.000000 \0009b - 0.000000 \0009c - 0.000000 \0009d - 0.000000 \0009e - 0.000000 \0009f - 0.000000 \000a0 - 0.000000 \000a1 - 0.000000 \000a2 - 0.000000 \000a3 - 0.000000 \000a4 - 0.000000 \000a5 - 0.000000 \000a6 - 0.000000 \000a7 - 0.000000 \000a8 - 0.000000 \000a9 - 0.000000 \000aa - 0.000000 \000ab - 0.000000 \000ac - 0.000000 \000ad - 0.000000 \000ae - 0.000000 \000af - 0.000000 \000b0 - 0.000000 \000b1 - 0.000000 \000b2 - 0.000000 \000b3 - 0.000000 \000b4 - 0.000000 \000b5 - 0.000000 \000b6 - 0.000000 \000b7 - 0.000000 \000b8 - 0.000000 \000b9 - 0.000000 \000ba - 0.000000 \000bb - 0.000000 \000bc - 0.000000 \000bd - 0.000000 \000be - 0.000000 \000bf - 0.000000 \000c0 - 0.000000 \000c1 - 0.000000 \000c2 - 0.000000 \000c3 - 0.000000 \000c4 - 0.000000 \000c5 - 0.000000 \000c6 - 0.000000 \000c7 - 0.000000 \000c8 - 0.000000 \000c9 - 0.000000 \000ca - 0.000000 \000cb - 0.000000 \000cc - 0.000000 \000cd - 0.000000 \000ce - 0.000000 \000cf - 0.000000 \000d0 - 0.000000 \000d1 - 0.000000 \000d2 - 0.000000 \000d3 - 0.000000 \000d4 - 0.000000 \000d5 - 0.000000 \000d6 - 0.000000 \000d7 - 0.000000 \000d8 - 0.000000 \000d9 - 0.000000 \000da - 0.000000 \000db - 0.000000 \000dc - 0.000000 \000dd - 0.000000 \000de - 0.000000 \000df - 0.000000 \000e0 - 0.000000 \000e1 - 0.000000 \000e2 - 0.000000 \000e3 - 0.000000 \000e4 - 0.000000 \000e5 - 0.000000 \000e6 - 0.000000 \000e7 - 0.000000 \000e8 - 0.000000 \000e9 - 0.000000 \000ea - 0.000000 \000eb - 0.000000 \000ec - 0.000000 \000ed - 0.000000 \000ee - 0.000000 \000ef - 0.000000 \000f0 - 0.000000 \000f1 - 0.000000 \000f2 - 0.000000 \000f3 - 0.000000 \000f4 - 0.000000 \000f5 - 0.000000 \000f6 - 0.000000 \000f7 - 0.000000 \000f8 - 0.000000 \000f9 - 0.000000 \000fa - 0.000000 \000fb - 0.000000 \000fc - 0.000000 \000fd - 0.000000 \000fe - 0.000000 \000ff - 0.000000 \00100 - 0.000000 \00101 - 0.000000 \00102 - 0.000000 \00103 - 0.000000 \00104 - 0.000000 \00105 - 0.000000 \00106 - 0.000000 \00107 - 0.000000 \00108 - 0.000000 \00109 - 0.000000 \0010a - 0.000000 \0010b - 0.000000 \0010c - 0.000000 \0010d - 0.000000 \0010e - 0.000000 \0010f - 0.000000 \00110 - 0.000000 \00111 - 0.000000 \00112 - 0.000000 \00113 - 0.000000 \00114 - 0.000000 \00115 - 0.000000 \00116 - 0.000000 \00117 - 0.000000 \00118 - 0.000000 \00119 - 0.000000 \0011a - 0.000000 \0011b - 0.000000 \0011c - 0.000000 \0011d - 0.000000 \0011e - 0.000000 \0011f - 0.000000 \00120 - 0.000000 \00121 - 0.000000 \00122 - 0.000000 \00123 - 0.000000 \00124 - 0.000000 \00125 - 0.000000 \00126 - 0.000000 \00127 - 0.000000 \00128 - 0.000000 \00129 - 0.000000 \0012a - 0.000000 \0012b - 0.000000 \0012c - 0.000000 \0012d - 0.000000 \0012e - 0.000000 \0012f - 0.000000 \00130 - 0.000000 \00131 - 0.000000 \00132 - 0.000000 \00133 - 0.000000 \00134 - 0.000000 \00135 - 0.000000 \00136 - 0.000000 \00137 - 0.000000 \00138 - 0.000000 \00139 - 0.000000 \0013a - 0.000000 \0013b - 0.000000 \0013c - 0.000000 \0013d - 0.000000 \0013e - 0.000000 \0013f - 0.000000 \00140 - 0.000000 \00141 - 0.000000 \00142 - 0.000000 \00143 - 0.000000 \00144 - 0.000000 \00145 - 0.000000 \00146 - 0.000000 \00147 - 0.000000 \00148 - 0.000000 \00149 - 0.000000 \0014a - 0.000000 \0014b - 0.000000 \0014c - 0.000000 \0014d - 0.000000 \0014e - 0.000000 \0014f - 0.000000 \00150 - 0.000000 \00151 - 0.000000 \00152 - 0.000000 \00153 - 0.000000 \00154 - 0.000000 \00155 - 0.000000 \00156 - 0.000000 \00157 - 0.000000 \00158 - 0.000000 \00159 - 0.000000 \0015a - 0.000000 \0015b - 0.000000 \0015c - 0.000000 \0015d - 0.000000 \0015e - 0.000000 \0015f - 0.000000 \00160 - 0.000000 \00161 - 0.000000 \00162 - 0.000000 \00163 - 0.000000 \00164 - 0.000000 \00165 - 0.000000 \00166 - 0.000000 \00167 - 0.000000 \00168 - 0.000000 \00169 - 0.000000 \0016a - 0.000000 \0016b - 0.000000 \0016c - 0.000000 \0016d - 0.000000 \0016e - 0.000000 \0016f - 0.000000 \00170 - 0.000000 \00171 - 0.000000 \00172 - 0.000000 \00173 - 0.000000 \00174 - 0.000000 \00175 - 0.000000 \00176 - 0.000000 \00177 - 0.000000 \00178 - 0.000000 \00179 - 0.000000 \0017a - 0.000000 \0017b - 0.000000 \0017c - 0.000000 \0017d - 0.000000 \0017e - 0.000000 \0017f - 0.000000 \00180 - 0.000000 \00181 - 0.000000 \00182 - 0.000000 \00183 - 0.000000 \00184 - 0.000000 \00185 - 0.000000 \00186 - 0.000000 \00187 - 0.000000 \00188 - 0.000000 \00189 - 0.000000 \0018a - 0.000000 \0018b - 0.000000 \0018c - 0.000000 \0018d - 0.000000 \0018e - 0.000000 \0018f - 0.000000 \00190 - 0.000000 \00191 - 0.000000 \00192 - 0.000000 \00193 - 0.000000 \00194 - 0.000000 \00195 - 0.000000 \00196 - 0.000000 \00197 - 0.000000 \00198 - 0.000000 \00199 - 0.000000 \0019a - 0.000000 \0019b - 0.000000 \0019c - 0.000000 \0019d - 0.000000 \0019e - 0.000000 \0019f - 0.000000 \001a0 - 0.000000 \001a1 - 0.000000 \001a2 - 0.000000 \001a3 - 0.000000 \001a4 - 0.000000 \001a5 - 0.000000 \001a6 - 0.000000 \001a7 - 0.000000 \001a8 - 0.000000 \001a9 - 0.000000 \001aa - 0.000000 \001ab - 0.000000 \001ac - 0.000000 \001ad - 0.000000 \001ae - 0.000000 \001af - 0.000000 \001b0 - 0.000000 \001b1 - 0.000000 \001b2 - 0.000000 \001b3 - 0.000000 \001b4 - 0.000000 \001b5 - 0.000000 \001b6 - 0.000000 \001b7 - 0.000000 \001b8 - 0.000000 \001b9 - 0.000000 \001ba - 0.000000 \001bb - 0.000000 \001bc - 0.000000 \001bd - 0.000000 \001be - 0.000000 \001bf - 0.000000 \001c0 - 0.000000 \001c1 - 0.000000 \001c2 - 0.000000 \001c3 - 0.000000 \001c4 - 0.000000 \001c5 - 0.000000 \001c6 - 0.000000 \001c7 - 0.000000 \001c8 - 0.000000 \001c9 - 0.000000 \001ca - 0.000000 \001cb - 0.000000 \001cc - 0.000000 \001cd - 0.000000 \001ce - 0.000000 \001cf - 0.000000 \001d0 - 0.000000 \001d1 - 0.000000 \001d2 - 0.000000 \001d3 - 0.000000 \001d4 - 0.000000 \001d5 - 0.000000 \001d6 - 0.000000 \001d7 - 0.000000 \001d8 - 0.000000 \001d9 - 0.000000 \001da - 0.000000 \001db - 0.000000 \001dc - 0.000000 \001dd - 0.000000 \001de - 0.000000 \001df - 0.000000 \001e0 - 0.000000 \001e1 - 0.000000 \001e2 - 0.000000 \001e3 - 0.000000 \001e4 - 0.000000 \001e5 - 0.000000 \001e6 - 0.000000 \001e7 - 0.000000 \001e8 - 0.000000 \001e9 - 0.000000 \001ea - 0.000000 \001eb - 0.000000 \001ec - 0.000000 \001ed - 0.000000 \001ee - 0.000000 \001ef - 0.000000 \001f0 - 0.000000 \001f1 - 0.000000 \001f2 - 0.000000 \001f3 - 0.000000 \001f4 - 0.000000 \001f5 - 0.000000 \001f6 - 0.000000 \001f7 - 0.000000 \001f8 - 0.000000 \001f9 - 0.000000 \001fa - 0.000000 \001fb - 0.000000 \001fc - 0.000000 \001fd - 0.000000 \001fe - 0.000000 \001ff - 0.000000 \00200 - 0.000000 \00201 - 0.000000 \00202 - 0.000000 \00203 - 0.000000 \00204 - 0.000000 \00205 - 0.000000 \00206 - 0.000000 \00207 - 0.000000 \00208 - 0.000000 \00209 - 0.000000 \0020a - 0.000000 \0020b - 0.000000 \0020c - 0.000000 \0020d - 0.000000 \0020e - 0.000000 \0020f - 0.000000 \00210 - 0.000000 \00211 - 0.000000 \00212 - 0.000000 \00213 - 0.000000 \00214 - 0.000000 \00215 - 0.000000 \00216 - 0.000000 \00217 - 0.000000 \00218 - 0.000000 \00219 - 0.000000 \0021a - 0.000000 \0021b - 0.000000 \0021c - 0.000000 \0021d - 0.000000 \0021e - 0.000000 \0021f - 0.000000 \00220 - 0.000000 \00221 - 0.000000 \00222 - 0.000000 \00223 - 0.000000 \00224 - 0.000000 \00225 - 0.000000 \00226 - 0.000000 \00227 - 0.000000 \00228 - 0.000000 \00229 - 0.000000 \0022a - 0.000000 \0022b - 0.000000 \0022c - 0.000000 \0022d - 0.000000 \0022e - 0.000000 \0022f - 0.000000 \00230 - 0.000000 \00231 - 0.000000 \00232 - 0.000000 \00233 - 0.000000 \00234 - 0.000000 \00235 - 0.000000 \00236 - 0.000000 \00237 - 0.000000 \00238 - 0.000000 \00239 - 0.000000 \0023a - 0.000000 \0023b - 0.000000 \0023c - 0.000000 \0023d - 0.000000 \0023e - 0.000000 \0023f - 0.000000 \00240 - 0.000000 \00241 - 0.000000 \00242 - 0.000000 \00243 - 0.000000 \00244 - 0.000000 \00245 - 0.000000 \00246 - 0.000000 \00247 - 0.000000 \00248 - 0.000000 \00249 - 0.000000 \0024a - 0.000000 \0024b - 0.000000 \0024c - 0.000000 \0024d - 0.000000 \0024e - 0.000000 \0024f - 0.000000 \00250 - 0.000000 \00251 - 0.000000 \00252 - 0.000000 \00253 - 0.000000 \00254 - 0.000000 \00255 - 0.000000 \00256 - 0.000000 \00257 - 0.000000 \00258 - 0.000000 \00259 - 0.000000 \0025a - 0.000000 \0025b - 0.000000 \0025c - 0.000000 \0025d - 0.000000 \0025e - 0.000000 \0025f - 0.000000 \00260 - 0.000000 \00261 - 0.000000 \00262 - 0.000000 \00263 - 0.000000 \00264 - 0.000000 \00265 - 0.000000 \00266 - 0.000000 \00267 - 0.000000 \00268 - 0.000000 \00269 - 0.000000 \0026a - 0.000000 \0026b - 0.000000 \0026c - 0.000000 \0026d - 0.000000 \0026e - 0.000000 \0026f - 0.000000 \00270 - 0.000000 \00271 - 0.000000 \00272 - 0.000000 \00273 - 0.000000 \00274 - 0.000000 \00275 - 0.000000 \00276 - 0.000000 \00277 - 0.000000 \00278 - 0.000000 \00279 - 0.000000 \0027a - 0.000000 \0027b - 0.000000 \0027c - 0.000000 \0027d - 0.000000 \0027e - 0.000000 \0027f - 0.000000 \00280 - 0.000000 \00281 - 0.000000 \00282 - 0.000000 \00283 - 0.000000 \00284 - 0.000000 \00285 - 0.000000 \00286 - 0.000000 \00287 - 0.000000 \00288 - 0.000000 \00289 - 0.000000 \0028a - 0.000000 \0028b - 0.000000 \0028c - 0.000000 \0028d - 0.000000 \0028e - 0.000000 \0028f - 0.000000 \00290 - 0.000000 \00291 - 0.000000 \00292 - 0.000000 \00293 - 0.000000 \00294 - 0.000000 \00295 - 0.000000 \00296 - 0.000000 \00297 - 0.000000 \00298 - 0.000000 \00299 - 0.000000 \0029a - 0.000000 \0029b - 0.000000 \0029c - 0.000000 \0029d - 0.000000 \0029e - 0.000000 \0029f - 0.000000 \002a0 - 0.000000 \002a1 - 0.000000 \002a2 - 0.000000 \002a3 - 0.000000 \002a4 - 0.000000 \002a5 - 0.000000 \002a6 - 0.000000 \002a7 - 0.000000 \002a8 - 0.000000 \002a9 - 0.000000 \002aa - 0.000000 \002ab - 0.000000 \002ac - 0.000000 \002ad - 0.000000 \002ae - 0.000000 \002af - 0.000000 \002b0 - 0.000000 \002b1 - 0.000000 \002b2 - 0.000000 \002b3 - 0.000000 \002b4 - 0.000000 \002b5 - 0.000000 \002b6 - 0.000000 \002b7 - 0.000000 \002b8 - 0.000000 \002b9 - 0.000000 \002ba - 0.000000 \002bb - 0.000000 \002bc - 0.000000 \002bd - 0.000000 \002be - 0.000000 \002bf - 0.000000 \002c0 - 0.000000 \002c1 - 0.000000 \002c2 - 0.000000 \002c3 - 0.000000 \002c4 - 0.000000 \002c5 - 0.000000 \002c6 - 0.000000 \002c7 - 0.000000 \002c8 - 0.000000 \002c9 - 0.000000 \002ca - 0.000000 \002cb - 0.000000 \002cc - 0.000000 \002cd - 0.000000 \002ce - 0.000000 \002cf - 0.000000 \002d0 - 0.000000 \002d1 - 0.000000 \002d2 - 0.000000 \002d3 - 0.000000 \002d4 - 0.000000 \002d5 - 0.000000 \002d6 - 0.000000 \002d7 - 0.000000 \002d8 - 0.000000 \002d9 - 0.000000 \002da - 0.000000 \002db - 0.000000 \002dc - 0.000000 \002dd - 0.000000 \002de - 0.000000 \002df - 0.000000 \002e0 - 0.000000 \002e1 - 0.000000 \002e2 - 0.000000 \002e3 - 0.000000 \002e4 - 0.000000 \002e5 - 0.000000 \002e6 - 0.000000 \002e7 - 0.000000 \002e8 - 0.000000 \002e9 - 0.000000 \002ea - 0.000000 \002eb - 0.000000 \002ec - 0.000000 \002ed - 0.000000 \002ee - 0.000000 \002ef - 0.000000 \002f0 - 0.000000 \002f1 - 0.000000 \002f2 - 0.000000 \002f3 - 0.000000 \002f4 - 0.000000 \002f5 - 0.000000 \002f6 - 0.000000 \002f7 - 0.000000 \002f8 - 0.000000 \002f9 - 0.000000 \002fa - 0.000000 \002fb - 0.000000 \002fc - 0.000000 \002fd - 0.000000 \002fe - 0.000000 \002ff - 0.000000 \00300 - 0.000000 \00301 - 0.000000 \00302 - 0.000000 \00303 - 0.000000 \00304 - 0.000000 \00305 - 0.000000 \00306 - 0.000000 \00307 - 0.000000 \00308 - 0.000000 \00309 - 0.000000 \0030a - 0.000000 \0030b - 0.000000 \0030c - 0.000000 \0030d - 0.000000 \0030e - 0.000000 \0030f - 0.000000 \00310 - 0.000000 \00311 - 0.000000 \00312 - 0.000000 \00313 - 0.000000 \00314 - 0.000000 \00315 - 0.000000 \00316 - 0.000000 \00317 - 0.000000 \00318 - 0.000000 \00319 - 0.000000 \0031a - 0.000000 \0031b - 0.000000 \0031c - 0.000000 \0031d - 0.000000 \0031e - 0.000000 \0031f - 0.000000 \00320 - 0.000000 \00321 - 0.000000 \00322 - 0.000000 \00323 - 0.000000 \00324 - 0.000000 \00325 - 0.000000 \00326 - 0.000000 \00327 - 0.000000 \00328 - 0.000000 \00329 - 0.000000 \0032a - 0.000000 \0032b - 0.000000 \0032c - 0.000000 \0032d - 0.000000 \0032e - 0.000000 \0032f - 0.000000 \00330 - 0.000000 \00331 - 0.000000 \00332 - 0.000000 \00333 - 0.000000 \00334 - 0.000000 \00335 - 0.000000 \00336 - 0.000000 \00337 - 0.000000 \00338 - 0.000000 \00339 - 0.000000 \0033a - 0.000000 \0033b - 0.000000 \0033c - 0.000000 \0033d - 0.000000 \0033e - 0.000000 \0033f - 0.000000 \00340 - 0.000000 \00341 - 0.000000 \00342 - 0.000000 \00343 - 0.000000 \00344 - 0.000000 \00345 - 0.000000 \00346 - 0.000000 \00347 - 0.000000 \00348 - 0.000000 \00349 - 0.000000 \0034a - 0.000000 \0034b - 0.000000 \0034c - 0.000000 \0034d - 0.000000 \0034e - 0.000000 \0034f - 0.000000 \00350 - 0.000000 \00351 - 0.000000 \00352 - 0.000000 \00353 - 0.000000 \00354 - 0.000000 \00355 - 0.000000 \00356 - 0.000000 \00357 - 0.000000 \00358 - 0.000000 \00359 - 0.000000 \0035a - 0.000000 \0035b - 0.000000 \0035c - 0.000000 \0035d - 0.000000 \0035e - 0.000000 \0035f - 0.000000 \00360 - 0.000000 \00361 - 0.000000 \00362 - 0.000000 \00363 - 0.000000 \00364 - 0.000000 \00365 - 0.000000 \00366 - 0.000000 \00367 - 0.000000 \00368 - 0.000000 \00369 - 0.000000 \0036a - 0.000000 \0036b - 0.000000 \0036c - 0.000000 \0036d - 0.000000 \0036e - 0.000000 \0036f - 0.000000 \00370 - 0.000000 \00371 - 0.000000 \00372 - 0.000000 \00373 - 0.000000 \00374 - 0.000000 \00375 - 0.000000 \00376 - 0.000000 \00377 - 0.000000 \00378 - 0.000000 \00379 - 0.000000 \0037a - 0.000000 \0037b - 0.000000 \0037c - 0.000000 \0037d - 0.000000 \0037e - 0.000000 \0037f - 0.000000 \00380 - 0.000000 \00381 - 0.000000 \00382 - 0.000000 \00383 - 0.000000 \00384 - 0.000000 \00385 - 0.000000 \00386 - 0.000000 \00387 - 0.000000 \00388 - 0.000000 \00389 - 0.000000 \0038a - 0.000000 \0038b - 0.000000 \0038c - 0.000000 \0038d - 0.000000 \0038e - 0.000000 \0038f - 0.000000 \00390 - 0.000000 \00391 - 0.000000 \00392 - 0.000000 \00393 - 0.000000 \00394 - 0.000000 \00395 - 0.000000 \00396 - 0.000000 \00397 - 0.000000 \00398 - 0.000000 \00399 - 0.000000 \0039a - 0.000000 \0039b - 0.000000 \0039c - 0.000000 \0039d - 0.000000 \0039e - 0.000000 \0039f - 0.000000 \003a0 - 0.000000 \003a1 - 0.000000 \003a2 - 0.000000 \003a3 - 0.000000 \003a4 - 0.000000 \003a5 - 0.000000 \003a6 - 0.000000 \003a7 - 0.000000 \003a8 - 0.000000 \003a9 - 0.000000 \003aa - 0.000000 \003ab - 0.000000 \003ac - 0.000000 \003ad - 0.000000 \003ae - 0.000000 \003af - 0.000000 \003b0 - 0.000000 \003b1 - 0.000000 \003b2 - 0.000000 \003b3 - 0.000000 \003b4 - 0.000000 \003b5 - 0.000000 \003b6 - 0.000000 \003b7 - 0.000000 \003b8 - 0.000000 \003b9 - 0.000000 \003ba - 0.000000 \003bb - 0.000000 \003bc - 0.000000 \003bd - 0.000000 \003be - 0.000000 \003bf - 0.000000 \003c0 - 0.000000 \003c1 - 0.000000 \003c2 - 0.000000 \003c3 - 0.000000 \003c4 - 0.000000 \003c5 - 0.000000 \003c6 - 0.000000 \003c7 - 0.000000 \003c8 - 0.000000 \003c9 - 0.000000 \003ca - 0.000000 \003cb - 0.000000 \003cc - 0.000000 \003cd - 0.000000 \003ce - 0.000000 \003cf - 0.000000 \003d0 - 0.000000 \003d1 - 0.000000 \003d2 - 0.000000 \003d3 - 0.000000 \003d4 - 0.000000 \003d5 - 0.000000 \003d6 - 0.000000 \003d7 - 0.000000 \003d8 - 0.000000 \003d9 - 0.000000 \003da - 0.000000 \003db - 0.000000 \003dc - 0.000000 \003dd - 0.000000 \003de - 0.000000 \003df - 0.000000 \003e0 - 0.000000 \003e1 - 0.000000 \003e2 - 0.000000 \003e3 - 0.000000 \003e4 - 0.000000 \003e5 - 0.000000 \003e6 - 0.000000 \003e7 - 0.000000 \003e8 - 0.000000 \003e9 - 0.000000 \003ea - 0.000000 \003eb - 0.000000 \003ec - 0.000000 \003ed - 0.000000 \003ee - 0.000000 \003ef - 0.000000 \003f0 - 0.000000 \003f1 - 0.000000 \003f2 - 0.000000 \003f3 - 0.000000 \003f4 - 0.000000 \003f5 - 0.000000 \003f6 - 0.000000 \003f7 - 0.000000 \003f8 - 0.000000 \003f9 - 0.000000 \003fa - 0.000000 \003fb - 0.000000 \003fc - 0.000000 \003fd - 0.000000 \003fe - 0.000000 \003ff - 0.000000 \00400 - 0.000000 \00401 - 0.000000 \00402 - 0.000000 \00403 - 0.000000 \00404 - 0.000000 \00405 - 0.000000 \00406 - 0.000000 \00407 - 0.000000 \00408 - 0.000000 \00409 - 0.000000 \0040a - 0.000000 \0040b - 0.000000 \0040c - 0.000000 \0040d - 0.000000 \0040e - 0.000000 \0040f - 0.000000 \00410 - 0.000000 \00411 - 0.000000 \00412 - 0.000000 \00413 - 0.000000 \00414 - 0.000000 \00415 - 0.000000 \00416 - 0.000000 \00417 - 0.000000 \00418 - 0.000000 \00419 - 0.000000 \0041a - 0.000000 \0041b - 0.000000 \0041c - 0.000000 \0041d - 0.000000 \0041e - 0.000000 \0041f - 0.000000 \00420 - 0.000000 \00421 - 0.000000 \00422 - 0.000000 \00423 - 0.000000 \00424 - 0.000000 \00425 - 0.000000 \00426 - 0.000000 \00427 - 0.000000 \00428 - 0.000000 \00429 - 0.000000 \0042a - 0.000000 \0042b - 0.000000 \0042c - 0.000000 \0042d - 0.000000 \0042e - 0.000000 \0042f - 0.000000 \00430 - 0.000000 \00431 - 0.000000 \00432 - 0.000000 \00433 - 0.000000 \00434 - 0.000000 \00435 - 0.000000 \00436 - 0.000000 \00437 - 0.000000 \00438 - 0.000000 \00439 - 0.000000 \0043a - 0.000000 \0043b - 0.000000 \0043c - 0.000000 \0043d - 0.000000 \0043e - 0.000000 \0043f - 0.000000 \00440 - 0.000000 \00441 - 0.000000 \00442 - 0.000000 \00443 - 0.000000 \00444 - 0.000000 \00445 - 0.000000 \00446 - 0.000000 \00447 - 0.000000 \00448 - 0.000000 \00449 - 0.000000 \0044a - 0.000000 \0044b - 0.000000 \0044c - 0.000000 \0044d - 0.000000 \0044e - 0.000000 \0044f - 0.000000 \00450 - 0.000000 \00451 - 0.000000 \00452 - 0.000000 \00453 - 0.000000 \00454 - 0.000000 \00455 - 0.000000 \00456 - 0.000000 \00457 - 0.000000 \00458 - 0.000000 \00459 - 0.000000 \0045a - 0.000000 \0045b - 0.000000 \0045c - 0.000000 \0045d - 0.000000 \0045e - 0.000000 \0045f - 0.000000 \00460 - 0.000000 \00461 - 0.000000 \00462 - 0.000000 \00463 - 0.000000 \00464 - 0.000000 \00465 - 0.000000 \00466 - 0.000000 \00467 - 0.000000 \00468 - 0.000000 \00469 - 0.000000 \0046a - 0.000000 \0046b - 0.000000 \0046c - 0.000000 \0046d - 0.000000 \0046e - 0.000000 \0046f - 0.000000 \00470 - 0.000000 \00471 - 0.000000 \00472 - 0.000000 \00473 - 0.000000 \00474 - 0.000000 \00475 - 0.000000 \00476 - 0.000000 \00477 - 0.000000 \00478 - 0.000000 \00479 - 0.000000 \0047a - 0.000000 \0047b - 0.000000 \0047c - 0.000000 \0047d - 0.000000 \0047e - 0.000000 \0047f - 0.000000 \00480 - 0.000000 \00481 - 0.000000 \00482 - 0.000000 \00483 - 0.000000 \00484 - 0.000000 \00485 - 0.000000 \00486 - 0.000000 \00487 - 0.000000 \00488 - 0.000000 \00489 - 0.000000 \0048a - 0.000000 \0048b - 0.000000 \0048c - 0.000000 \0048d - 0.000000 \0048e - 0.000000 \0048f - 0.000000 \00490 - 0.000000 \00491 - 0.000000 \00492 - 0.000000 \00493 - 0.000000 \00494 - 0.000000 \00495 - 0.000000 \00496 - 0.000000 \00497 - 0.000000 \00498 - 0.000000 \00499 - 0.000000 \0049a - 0.000000 \0049b - 0.000000 \0049c - 0.000000 \0049d - 0.000000 \0049e - 0.000000 \0049f - 0.000000 \004a0 - 0.000000 \004a1 - 0.000000 \004a2 - 0.000000 \004a3 - 0.000000 \004a4 - 0.000000 \004a5 - 0.000000 \004a6 - 0.000000 \004a7 - 0.000000 \004a8 - 0.000000 \004a9 - 0.000000 \004aa - 0.000000 \004ab - 0.000000 \004ac - 0.000000 \004ad - 0.000000 \004ae - 0.000000 \004af - 0.000000 \004b0 - 0.000000 \004b1 - 0.000000 \004b2 - 0.000000 \004b3 - 0.000000 \004b4 - 0.000000 \004b5 - 0.000000 \004b6 - 0.000000 \004b7 - 0.000000 \004b8 - 0.000000 \004b9 - 0.000000 \004ba - 0.000000 \004bb - 0.000000 \004bc - 0.000000 \004bd - 0.000000 \004be - 0.000000 \004bf - 0.000000 \004c0 - 0.000000 \004c1 - 0.000000 \004c2 - 0.000000 \004c3 - 0.000000 \004c4 - 0.000000 \004c5 - 0.000000 \004c6 - 0.000000 \004c7 - 0.000000 \004c8 - 0.000000 \004c9 - 0.000000 \004ca - 0.000000 \004cb - 0.000000 \004cc - 0.000000 \004cd - 0.000000 \004ce - 0.000000 \004cf - 0.000000 \004d0 - 0.000000 \004d1 - 0.000000 \004d2 - 0.000000 \004d3 - 0.000000 \004d4 - 0.000000 \004d5 - 0.000000 \004d6 - 0.000000 \004d7 - 0.000000 \004d8 - 0.000000 \004d9 - 0.000000 \004da - 0.000000 \004db - 0.000000 \004dc - 0.000000 \004dd - 0.000000 \004de - 0.000000 \004df - 0.000000 \004e0 - 0.000000 \004e1 - 0.000000 \004e2 - 0.000000 \004e3 - 0.000000 \004e4 - 0.000000 \004e5 - 0.000000 \004e6 - 0.000000 \004e7 - 0.000000 \004e8 - 0.000000 \004e9 - 0.000000 \004ea - 0.000000 \004eb - 0.000000 \004ec - 0.000000 \004ed - 0.000000 \004ee - 0.000000 \004ef - 0.000000 \004f0 - 0.000000 \004f1 - 0.000000 \004f2 - 0.000000 \004f3 - 0.000000 \004f4 - 0.000000 \004f5 - 0.000000 \004f6 - 0.000000 \004f7 - 0.000000 \004f8 - 0.000000 \004f9 - 0.000000 \004fa - 0.000000 \004fb - 0.000000 \004fc - 0.000000 \004fd - 0.000000 \004fe - 0.000000 \004ff - 0.000000 \00500 - 0.000000 \00501 - 0.000000 \00502 - 0.000000 \00503 - 0.000000 \00504 - 0.000000 \00505 - 0.000000 \00506 - 0.000000 \00507 - 0.000000 \00508 - 0.000000 \00509 - 0.000000 \0050a - 0.000000 \0050b - 0.000000 \0050c - 0.000000 \0050d - 0.000000 \0050e - 0.000000 \0050f - 0.000000 \00510 - 0.000000 \00511 - 0.000000 \00512 - 0.000000 \00513 - 0.000000 \00514 - 0.000000 \00515 - 0.000000 \00516 - 0.000000 \00517 - 0.000000 \00518 - 0.000000 \00519 - 0.000000 \0051a - 0.000000 \0051b - 0.000000 \0051c - 0.000000 \0051d - 0.000000 \0051e - 0.000000 \0051f - 0.000000 \00520 - 0.000000 \00521 - 0.000000 \00522 - 0.000000 \00523 - 0.000000 \00524 - 0.000000 \00525 - 0.000000 \00526 - 0.000000 \00527 - 0.000000 \00528 - 0.000000 \00529 - 0.000000 \0052a - 0.000000 \0052b - 0.000000 \0052c - 0.000000 \0052d - 0.000000 \0052e - 0.000000 \0052f - 0.000000 \00530 - 0.000000 \00531 - 0.000000 \00532 - 0.000000 \00533 - 0.000000 \00534 - 0.000000 \00535 - 0.000000 \00536 - 0.000000 \00537 - 0.000000 \00538 - 0.000000 \00539 - 0.000000 \0053a - 0.000000 \0053b - 0.000000 \0053c - 0.000000 \0053d - 0.000000 \0053e - 0.000000 \0053f - 0.000000 \00540 - 0.000000 \00541 - 0.000000 \00542 - 0.000000 \00543 - 0.000000 \00544 - 0.000000 \00545 - 0.000000 \00546 - 0.000000 \00547 - 0.000000 \00548 - 0.000000 \00549 - 0.000000 \0054a - 0.000000 \0054b - 0.000000 \0054c - 0.000000 \0054d - 0.000000 \0054e - 0.000000 \0054f - 0.000000 \00550 - 0.000000 \00551 - 0.000000 \00552 - 0.000000 \00553 - 0.000000 \00554 - 0.000000 \00555 - 0.000000 \00556 - 0.000000 \00557 - 0.000000 \00558 - 0.000000 \00559 - 0.000000 \0055a - 0.000000 \0055b - 0.000000 \0055c - 0.000000 \0055d - 0.000000 \0055e - 0.000000 \0055f - 0.000000 \00560 - 0.000000 \00561 - 0.000000 \00562 - 0.000000 \00563 - 0.000000 \00564 - 0.000000 \00565 - 0.000000 \00566 - 0.000000 \00567 - 0.000000 \00568 - 0.000000 \00569 - 0.000000 \0056a - 0.000000 \0056b - 0.000000 \0056c - 0.000000 \0056d - 0.000000 \0056e - 0.000000 \0056f - 0.000000 \00570 - 0.000000 \00571 - 0.000000 \00572 - 0.000000 \00573 - 0.000000 \00574 - 0.000000 \00575 - 0.000000 \00576 - 0.000000 \00577 - 0.000000 \00578 - 0.000000 \00579 - 0.000000 \0057a - 0.000000 \0057b - 0.000000 \0057c - 0.000000 \0057d - 0.000000 \0057e - 0.000000 \0057f - 0.000000 \00580 - 0.000000 \00581 - 0.000000 \00582 - 0.000000 \00583 - 0.000000 \00584 - 0.000000 \00585 - 0.000000 \00586 - 0.000000 \00587 - 0.000000 \00588 - 0.000000 \00589 - 0.000000 \0058a - 0.000000 \0058b - 0.000000 \0058c - 0.000000 \0058d - 0.000000 \0058e - 0.000000 \0058f - 0.000000 \00590 - 0.000000 \00591 - 0.000000 \00592 - 0.000000 \00593 - 0.000000 \00594 - 0.000000 \00595 - 0.000000 \00596 - 0.000000 \00597 - 0.000000 \00598 - 0.000000 \00599 - 0.000000 \0059a - 0.000000 \0059b - 0.000000 \0059c - 0.000000 \0059d - 0.000000 \0059e - 0.000000 \0059f - 0.000000 \005a0 - 0.000000 \005a1 - 0.000000 \005a2 - 0.000000 \005a3 - 0.000000 \005a4 - 0.000000 \005a5 - 0.000000 \005a6 - 0.000000 \005a7 - 0.000000 \005a8 - 0.000000 \005a9 - 0.000000 \005aa - 0.000000 \005ab - 0.000000 \005ac - 0.000000 \005ad - 0.000000 \005ae - 0.000000 \005af - 0.000000 \005b0 - 0.000000 \005b1 - 0.000000 \005b2 - 0.000000 \005b3 - 0.000000 \005b4 - 0.000000 \005b5 - 0.000000 \005b6 - 0.000000 \005b7 - 0.000000 \005b8 - 0.000000 \005b9 - 0.000000 \005ba - 0.000000 \005bb - 0.000000 \005bc - 0.000000 \005bd - 0.000000 \005be - 0.000000 \005bf - 0.000000 \005c0 - 0.000000 \005c1 - 0.000000 \005c2 - 0.000000 \005c3 - 0.000000 \005c4 - 0.000000 \005c5 - 0.000000 \005c6 - 0.000000 \005c7 - 0.000000 \005c8 - 0.000000 \005c9 - 0.000000 \005ca - 0.000000 \005cb - 0.000000 \005cc - 0.000000 \005cd - 0.000000 \005ce - 0.000000 \005cf - 0.000000 \005d0 - 0.000000 \005d1 - 0.000000 \005d2 - 0.000000 \005d3 - 0.000000 \005d4 - 0.000000 \005d5 - 0.000000 \005d6 - 0.000000 \005d7 - 0.000000 \005d8 - 0.000000 \005d9 - 0.000000 \005da - 0.000000 \005db - 0.000000 \005dc - 0.000000 \005dd - 0.000000 \005de - 0.000000 \005df - 0.000000 \005e0 - 0.000000 \005e1 - 0.000000 \005e2 - 0.000000 \005e3 - 0.000000 \005e4 - 0.000000 \005e5 - 0.000000 \005e6 - 0.000000 \005e7 - 0.000000 \005e8 - 0.000000 \005e9 - 0.000000 \005ea - 0.000000 \005eb - 0.000000 \005ec - 0.000000 \005ed - 0.000000 \005ee - 0.000000 \005ef - 0.000000 \005f0 - 0.000000 \005f1 - 0.000000 \005f2 - 0.000000 \005f3 - 0.000000 \005f4 - 0.000000 \005f5 - 0.000000 \005f6 - 0.000000 \005f7 - 0.000000 \005f8 - 0.000000 \005f9 - 0.000000 \005fa - 0.000000 \005fb - 0.000000 \005fc - 0.000000 \005fd - 0.000000 \005fe - 0.000000 \005ff - 0.000000 \00600 - 0.000000 \00601 - 0.000000 \00602 - 0.000000 \00603 - 0.000000 \00604 - 0.000000 \00605 - 0.000000 \00606 - 0.000000 \00607 - 0.000000 \00608 - 0.000000 \00609 - 0.000000 \0060a - 0.000000 \0060b - 0.000000 \0060c - 0.000000 \0060d - 0.000000 \0060e - 0.000000 \0060f - 0.000000 \00610 - 0.000000 \00611 - 0.000000 \00612 - 0.000000 \00613 - 0.000000 \00614 - 0.000000 \00615 - 0.000000 \00616 - 0.000000 \00617 - 0.000000 \00618 - 0.000000 \00619 - 0.000000 \0061a - 0.000000 \0061b - 0.000000 \0061c - 0.000000 \0061d - 0.000000 \0061e - 0.000000 \0061f - 0.000000 \00620 - 0.000000 \00621 - 0.000000 \00622 - 0.000000 \00623 - 0.000000 \00624 - 0.000000 \00625 - 0.000000 \00626 - 0.000000 \00627 - 0.000000 \00628 - 0.000000 \00629 - 0.000000 \0062a - 0.000000 \0062b - 0.000000 \0062c - 0.000000 \0062d - 0.000000 \0062e - 0.000000 \0062f - 0.000000 \00630 - 0.000000 \00631 - 0.000000 \00632 - 0.000000 \00633 - 0.000000 \00634 - 0.000000 \00635 - 0.000000 \00636 - 0.000000 \00637 - 0.000000 \00638 - 0.000000 \00639 - 0.000000 \0063a - 0.000000 \0063b - 0.000000 \0063c - 0.000000 \0063d - 0.000000 \0063e - 0.000000 \0063f - 0.000000 \00640 - 0.000000 \00641 - 0.000000 \00642 - 0.000000 \00643 - 0.000000 \00644 - 0.000000 \00645 - 0.000000 \00646 - 0.000000 \00647 - 0.000000 \00648 - 0.000000 \00649 - 0.000000 \0064a - 0.000000 \0064b - 0.000000 \0064c - 0.000000 \0064d - 0.000000 \0064e - 0.000000 \0064f - 0.000000 \00650 - 0.000000 \00651 - 0.000000 \00652 - 0.000000 \00653 - 0.000000 \00654 - 0.000000 \00655 - 0.000000 \00656 - 0.000000 \00657 - 0.000000 \00658 - 0.000000 \00659 - 0.000000 \0065a - 0.000000 \0065b - 0.000000 \0065c - 0.000000 \0065d - 0.000000 \0065e - 0.000000 \0065f - 0.000000 \00660 - 0.000000 \00661 - 0.000000 \00662 - 0.000000 \00663 - 0.000000 \00664 - 0.000000 \00665 - 0.000000 \00666 - 0.000000 \00667 - 0.000000 \00668 - 0.000000 \00669 - 0.000000 \0066a - 0.000000 \0066b - 0.000000 \0066c - 0.000000 \0066d - 0.000000 \0066e - 0.000000 \0066f - 0.000000 \00670 - 0.000000 \00671 - 0.000000 \00672 - 0.000000 \00673 - 0.000000 \00674 diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c index 9cd2cb849..f79a50795 100644 --- a/gpsbabel/saroute.c +++ b/gpsbabel/saroute.c @@ -50,7 +50,7 @@ unsigned char * ReadRecord(FILE * f, unsigned long size) { - unsigned char *result = xmalloc(size); + unsigned char *result = (unsigned char *) xmalloc(size); fread(result, size, 1, f); return result; @@ -146,10 +146,10 @@ my_read(void) lon = (0x80000000UL - le_read32(&latlon->lon)) / (double)(0x800000); - wpt_tmp = xcalloc(sizeof (*wpt_tmp), 1); + wpt_tmp = waypt_new(); wpt_tmp->latitude = lat; wpt_tmp->longitude = -lon; - wpt_tmp->shortname = xmalloc(7); + wpt_tmp->shortname = (char *) xmalloc(7); sprintf( wpt_tmp->shortname, "\\%5.5x", serial++ ); route_add_wpt(track_head, wpt_tmp); xfree(record); @@ -209,7 +209,7 @@ my_read(void) double lat; double lon; - wpt_tmp = xcalloc(sizeof (*wpt_tmp), 1); + wpt_tmp = waypt_new(); lat = (0x80000000UL - le_read32(&latlon->lat)) / @@ -220,7 +220,7 @@ my_read(void) wpt_tmp->latitude = lat; wpt_tmp->longitude = -lon; - wpt_tmp->shortname = xmalloc(7); + wpt_tmp->shortname = (char *) xmalloc(7); sprintf( wpt_tmp->shortname, "\\%5.5x", serial++ ); route_add_wpt(track_head, wpt_tmp); diff --git a/gpsbabel/tiger.c b/gpsbabel/tiger.c index a850588e3..9781aa2a8 100644 --- a/gpsbabel/tiger.c +++ b/gpsbabel/tiger.c @@ -46,7 +46,7 @@ static char *iconismarker = NULL; int scalev; int short_length; -int thresh_days; +double thresh_days; /* * The code bracketed by CLICKMAP is to generate clickable image maps diff --git a/gpsbabel/util.c b/gpsbabel/util.c index 3804a908f..dba2832e3 100644 --- a/gpsbabel/util.c +++ b/gpsbabel/util.c @@ -152,7 +152,7 @@ xstrndup(const char *str, size_t sz) newlen = sz; } - newstr = xmalloc(newlen + 1); + newstr = (char *) xmalloc(newlen + 1); memcpy(newstr, str, newlen); newstr[newlen] = 0; @@ -178,7 +178,7 @@ xstrndupt(const char *str, size_t sz) newlen = sz; } - newstr = xmalloc(newlen + 1); + newstr = (char *) xmalloc(newlen + 1); memcpy(newstr, str, newlen); newstr[newlen] = '\0'; rtrim(newstr); @@ -193,7 +193,7 @@ XREALLOC(void *p, size_t s, DEBUG_PARAMS ) xrealloc(void *p, size_t s) #endif { - char *o = realloc(p,s); + char *o = (char *) realloc(p,s); #ifdef DEBUG_MEM debug_mem_output( "realloc, %x, %x, %x, %s, %d\n", o, p, s, file, line ); @@ -211,20 +211,20 @@ xrealloc(void *p, size_t s) */ char * #ifdef DEBUG_MEM -XSTRAPPEND(char *src, const char *new, DEBUG_PARAMS) +XSTRAPPEND(char *src, const char *newd, DEBUG_PARAMS) #else -xstrappend(char *src, const char *new) +xstrappend(char *src, const char *newd) #endif { size_t newsz; if (!src) { - return xxstrdup(new, file, line); + return xxstrdup(newd, file, line); } - newsz = strlen(src) + strlen(new) + 1; + newsz = strlen(src) + strlen(newd) + 1; src = xxrealloc(src, newsz, file, line); - strcat(src, new); + strcat(src, newd); return src; } diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c index 80ee78f81..7b6c7efd5 100644 --- a/gpsbabel/waypt.c +++ b/gpsbabel/waypt.c @@ -37,7 +37,7 @@ waypoint * waypt_dupe(const waypoint *wpt) { waypoint * tmp; - tmp = xcalloc(sizeof *wpt, 1); + tmp = waypt_new(); memcpy(tmp, wpt, sizeof(waypoint)); if (wpt->shortname) @@ -110,7 +110,7 @@ waypt_new(void) { waypoint *wpt; - wpt = xcalloc(sizeof (*wpt), 1); + wpt = (waypoint *) xcalloc(sizeof (*wpt), 1); wpt->altitude = unknown_alt; return wpt; -- 2.30.2